From cfa7d760495ad306895739cf48b0aca5fa8750ec Mon Sep 17 00:00:00 2001
From: oliskoli <oliskoli@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Sun, 20 May 2007 21:27:01 +0000
Subject: [PATCH] Rename module garmin_poi. New name is now garmin_gpi.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@2793 f51c46e8-681c-474f-0cfe-069cfd0219fb
---
 gpsbabel/Makefile.in              |   4 ++--
 gpsbabel/garmin_gpi.c             |  36 +++++++++++++++---------------
 gpsbabel/reference/garmin_poi.gpi | Bin 7776 -> 0 bytes
 gpsbabel/testo                    |  10 ++++-----
 gpsbabel/vecs.c                   |   6 ++---
 5 files changed, 28 insertions(+), 28 deletions(-)
 delete mode 100644 gpsbabel/reference/garmin_poi.gpi

diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in
index 479801a09..3f6fcae2d 100644
--- a/gpsbabel/Makefile.in
+++ b/gpsbabel/Makefile.in
@@ -55,7 +55,7 @@ FMTS=magproto.o gpx.o geo.o mapsend.o mapsource.o garmin_tables.o \
 	ignrando.o stmwpp.o msroute.o cst.o nmn4.o mag_pdb.o compegps.o \
 	yahoo.o unicsv.o wfff_xml.o garmin_txt.o axim_gpb.o gpssim.o \
 	wbt-200.o stmsdf.o gtrnctr.o dmtlog.o raymarine.o alan.o vitovtt.o \
-	ggv_log.o g7towin.o garmin_poi.o
+	ggv_log.o g7towin.o garmin_gpi.o
 
 FILTERS=position.o radius.o duplicate.o arcdist.o polygon.o smplrout.o \
 	reverse_route.o sort.o stackfilter.o trackfilter.o discard.o \
@@ -413,7 +413,7 @@ garmin_fs.o: garmin_fs.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \
   jeeps/gpsproj.h garmin_tables.h
-garmin_poi.o: garmin_poi.c garmin_poi.h defs.h config.h queue.h gbtypes.h \
+garmin_gpi.o: garmin_gpi.c garmin_gpi.h defs.h config.h queue.h gbtypes.h \
   cet_util.h jeeps/gpsmath.h
 garmin_tables.o: garmin_tables.c garmin_tables.h defs.h config.h queue.h \
   gbtypes.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h \
diff --git a/gpsbabel/garmin_gpi.c b/gpsbabel/garmin_gpi.c
index 30acc74aa..573fb6aa3 100644
--- a/gpsbabel/garmin_gpi.c
+++ b/gpsbabel/garmin_gpi.c
@@ -36,13 +36,13 @@
 #include "defs.h"
 #include "cet_util.h"
 #include "jeeps/gpsmath.h"
-#include "garmin_poi.h"
+#include "garmin_gpi.h"
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
 
-#define MYNAME "garmin_poi"
+#define MYNAME "garmin_gpi"
 
 #define GPI_DBG 1
 #undef GPI_DBG
@@ -51,7 +51,7 @@
 
 static char *opt_cat, *opt_pos, *opt_notes, *opt_hide, *opt_descr;
 
-static arglist_t garmin_poi_args[] = {
+static arglist_t garmin_gpi_args[] = {
 	{"category", &opt_cat, "Default category on output", 
 		"My points", ARGTYPE_STRING, ARG_NOMINMAX},
 	{"hide", &opt_hide, "Don't show gpi bitmap on device", 
@@ -679,7 +679,7 @@ write_data(const char *group)
 *******************************************************************************/
 
 static void
-garmin_poi_rd_init(const char *fname)
+garmin_gpi_rd_init(const char *fname)
 {
 	char cp[8];
 	
@@ -697,7 +697,7 @@ garmin_poi_rd_init(const char *fname)
 
 
 static void
-garmin_poi_wr_init(const char *fname)
+garmin_gpi_wr_init(const char *fname)
 {
 	char cp[8];
 	cet_cs_vec_t *vec;
@@ -738,7 +738,7 @@ garmin_poi_wr_init(const char *fname)
 
 
 static void 
-garmin_poi_rd_deinit(void)
+garmin_gpi_rd_deinit(void)
 {
 	if (dt->category) xfree(dt->category);
 	if (dt->group) xfree(dt->group);
@@ -748,7 +748,7 @@ garmin_poi_rd_deinit(void)
 
 
 static void 
-garmin_poi_wr_deinit(void)
+garmin_gpi_wr_deinit(void)
 {
 	queue *elem, *tmp;
 	
@@ -762,20 +762,20 @@ garmin_poi_wr_deinit(void)
 
 
 static void
-garmin_poi_read(void)
+garmin_gpi_read(void)
 {
 	while (! gbfeof(fin)) {	/* main loop */
 		int tag;
 		
 		tag = gbfgetint32(fin);
 		if ((tag == 0xffff) || (tag == 0xff)) return;
-		if (! read_tag("garmin_poi_read", tag, NULL)) return;
+		if (! read_tag("garmin_gpi_read", tag, NULL)) return;
 	};
 }
 
 
 static void
-garmin_poi_write(void)
+garmin_gpi_write(void)
 {
 	if (strlen(opt_cat) == 0) fatal(MYNAME ": Can't write empty category!\n");
 	
@@ -788,21 +788,21 @@ garmin_poi_write(void)
 
 /**************************************************************************/
 
-ff_vecs_t garmin_poi_vecs = {
+ff_vecs_t garmin_gpi_vecs = {
 	ff_type_file,
 	{ 
 		ff_cap_read | ff_cap_write 	/* waypoints */, 
 	  	ff_cap_none 			/* tracks */, 
 	  	ff_cap_none 			/* routes */
 	},
-	garmin_poi_rd_init,	
-	garmin_poi_wr_init,
-	garmin_poi_rd_deinit,	
-	garmin_poi_wr_deinit,
-	garmin_poi_read,
-	garmin_poi_write,
+	garmin_gpi_rd_init,	
+	garmin_gpi_wr_init,
+	garmin_gpi_rd_deinit,	
+	garmin_gpi_wr_deinit,
+	garmin_gpi_read,
+	garmin_gpi_write,
 	NULL,
-	garmin_poi_args,
+	garmin_gpi_args,
 	CET_CHARSET_MS_ANSI, 0		/* WIN-CP1252 */
 };
 
diff --git a/gpsbabel/reference/garmin_poi.gpi b/gpsbabel/reference/garmin_poi.gpi
deleted file mode 100644
index 290d8923243e421b83d12bfeb357cb4631309bf7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7776
zcmeHLd2m!k8vlYEAsnJngdokJh%981_uk~qfg8yrd6|SvX2MJk0%9@=W5_vSGC6?E
zL=X$aDoPN6TGR!K6|1;KbSWsVz$y!Zuz_6_EkKF_1xr?0MA%}xdwB762Vdd-yF1tv
z_V?BA{l2rmZUBJ6csV?I9wkE%+`jDwfZk9yE2*-fDh5mX<CX8u!G8<Fg`NO?Ar=x4
zz~;vQ2H;)A)fe(+85#mr^`XXCEL?&G_&+$9WI_{%HhdzT9gT(_t@#9RK@7z7z$)qZ
zpTqF#eZz=0bk=@?x5;M|S1ibaZ1uS9nfOc4122F$ydK5tA-ojV03cFBhR5yo=C~XL
zO~wN9!9g8H)H<?`pv6+%o*2z+W|7Euv{EgA_iskz7{~)ybO9_{fO7|psC+vIVAEw_
zGiw1RZc0M)S5t>{krY!T9R^rR08+78!|@t&EeT0;D8NAKgE)}IloW4aUS3WC3q$0@
zw~DJbc$@0#szL;465b&|fj!CS-Pd^_tIO_E^6f0p6IdN51O`d~m#^O6;A@=Wuk(it
zo`7$<AtM-QY^<uUB;XUU7K!_5M-tk!jg7k~3k7ypE(`rIR#xpOwihTK1JTiXtT{Is
z74POeChNIel&Q;!#|W1vJCaemfyS&W2Stl5Q{i)P5LQ+-GX2;xrGC1W$?S~+Dtnk^
zB1tK%K}`B#sTLs8AR^CWJb+CXz(xSn;Gg-IfMTDf0IJhu$z)FV<YYP&7DgNV^kCKW
zO23xL>VYD1By&tmdW9gFXd&3{I`z;j5xqT@0;n#-Ol;i?Tk8*!E`)^xgOC&);S<p0
zk2rH=DZkK@@8rxGg4G|vOK}Z?{H9<-tsf^}MU5f5s<u{Z*qr48`qK%{Fj+T7G83ca
z{RLFLnFp}4&ea+vOR`nVU^QmY^Bf0Y)@5L(42Wxo;uUWaQT%ZVpjNLenJogxK^x$x
zoUl+q4#bN{xYi9s7Fa`g5LqA~q>4#=wu}@}Odnb~zoeVl;!gJ#*fUrlZSA<r8$-T|
zTAFYwpOv=-bUxa7e=*8p7CFDLe283Y)V?bMIx?K{(Sn#nmJ1JJ61DLerif_B7`BB=
z7S6eBfGsq@#1zs`-Ypl=u_U&iV1WBeed5~3@j5PwD6xrxsAsG!SuL~$veuAOQC0Ey
z8~wrNKvhs{P+3Go6Kgnwth!yr+SOHvK_eH5=+GL@Alq+fkZPxW?s*9vjpj>NQ!rUl
zvT{6JHEXj)zN?`%Y3EuA{dE{?lF6di^RbiwsEzXYdI?p=Qh=_^#VYsTC{>gCu98sr
zY1TIw=>89nEbL%XOSd*lXvm0ejJyRN#h%AToQyj0cqy(2!5a$teRa$kYr!I-viz_S
zjqXveorcVUz&S}<3q)$8sjOOea)%M!y2e;Xl+vArIssEPh`;Ta2eHmvW<;x=p<Gmd
zn*}i?51+B_V%9qCiT{fZ0n5B=Sn^II`g1&In8+DM5|?;Eam7P=RgK@^3<Mes8G-tG
ze?=(36v&XAB(y(DPMx{Tf}~R*L`n!fi}6XZ7LLMm=Q&D9twghsBGD0*HBOt@+PO%b
zVC~sPboDl8nrvc0w9UsX$R<KX1$d#;h$dwP*r4l;z-BxkYXK%-F{1W#9zf^h#{kR-
zT>pR(B`oCtEL;m_O|UQxICpO%ay9S(x<0T_ACP1tVIOtYh}=O6ptc#aV6iye4lnCS
zGBA*cD6anC3{)~zq&hTrjuC|pacr#IvBa8VrH7JQL%&~`gq|v-A?;!#O5*)@2$jj!
zX-UYpj?E3x#2wfS6D-w+HfvrITECbF(2I=79*u`jC85i`SYL>`*@>luf$EDZreriH
zj*W~c%fH<hd*4n%rU=JGH_1dc$>J)K(Wn3q!1WN;nb8wOjYj{u$>^*3Jb+%Eh!$EW
zYSTE4qj6~o1?XxTqE-Aan#O_|0@_u{Qjsh=cSbXolCY4If=ravRRZdqL;=*fiKry$
zrN&(d)g42fc*vN+bI_TZ@CTT&xDTGIm#yajta{lkS()s9y-h&lxA6daZ9}p$t@FSi
zMC9foD(THhW-Qg#*Q7)d)$HIH*z{6DvN5f*<D!HnjAIMbB<VR3OSScN_;CrfoMd~A
zNjClV`kGKGA@Ls^6TNGa*%ZAdsq=jO#}e9li~@9}lu5QoTvjsU2bB|ZRFHokm5}Rd
zHxMfqR33y4>%?azG<Gr@6_bU7U@9F;wP7XCSIhpw`oe6|I{~m%3()k(L{#6%GO$_n
z<_j!k016XPYYGRTn^?AJVkx+|$$-+hPC|coQUJBrq$_rhAv?$EWRFBLGO4p=mx`gl
zU95NrBejvQn3Ra7rcprkP)k>wPNhh1FjO@Nkb1>WFA~w!n-oYL3^VPX+-$egneS$)
zX|MR1z97Ea2Wo2rEr$F+^ciM6rcSz9dyGJz8}TckntBfWa>QRHAH=Ht@KRiTz~Kw|
z4bi)#iqcXjqHAw67i5aU9TDA8=rpCG6ym#A&XaV2X1H)op*srg3o1&u16SicP`DK8
zjzY6YMIq0zqf)7>wOk~w%XdSO=yax{wDiD@9zW`G-sPXUx}(sNuwsXkIDYI*L@iM+
zeQ6AO0r9TPMqFFiG(<8<9Tj6(X(Fn=PU}*O!3C%r28~Y!{wTSZR1Pqr`JEI)O}~7*
zt03ExVK3sYIND(`-&Y@+;SU-ze9iO~BNs!FIwL3XN70j5tut@7qU2|}o!omi`8Y{d
z#q}t7XZZaMF9d3*8}e~l<Cju=R|yeIv#~+~UjO_`K*Jq0a%#qU-S+%+_hi;zgaYxd
z;(7$U0bhe5J<w{%^asml847~Fike<nHoZ6g3u}=-<hGNB-`Eq$7Jll#ga42hfBa(h
zYrl4g-0KGsh_q{dC6#{qf82g3HN7Z86uJGNHOFzU{jkLmzTf?}+WgGt-OW)N6u$-k
zJ5oLXdJT&0TY_2N{qFA`ceb~e_2@s=GO42Y(aBx=Gp5)}OZyB=wcGOwYkZ@Ni^nAk
z1g9nJN=+Rs+rv3SvONV;MX@5vKP}wkaM<OvAZnX7+>n!+IyJgq_T21*glDYN29|_>
zAGEZVm5p)FBsh@_Q&rVtPlOYn9y=~9`P^>v1SjPg89#2El91*ITkH=%^?X)VUb#2A
z-#Bw-b-ZnuQl39P5}7mSxv4qP{gRlN-qU5*v!h48(603C`OsZ|Mt*I-EiUdse>gO=
z4Lf1-0}qVr@_$`jz&N~OcBE<AP^qCI(6x{K7WT^hMhr}u5)CT;?!AAJ_IsrR-iwQi
zgMR(`!QjDzVZ?|LFlNjcFdB^@%QB><rb1d;8rbc2$jHcmtgI|>I2@3hn+q<N3%p)0
z6ciLdQBe_;l$5}fDN~@dv=qw9%AmZw94aa*pt`ymLZJ{eH8nwVb2GHIw!*Agvtah@
z+0fS32H|j+q$<4l;)^hM?p&BRZyvn#(n~OZ{(N}(<(FZ>f(5W};X-)jl~-WVqDAoP
ztFOZ1#f#y!*It7qOP0XWrAuMivSskb8*jk!<;!8kiWRVO<w{t!Y8AZs=9}==TW`VY
z)vIC6nl-R??OIs3ZXLYy&O5Mv{d(B2VFPU3xDhsO+60?7Z-y;fw!qe{TVdO_ZSdZE
z@4@!%+u{B9--jJLcEAT8d;lMQ_#y1vxf6En+6B9J?}j~l_Q2k~dtu+ceXxK3emHR8
z0CaS8z`=tD;n1N&aQN_HICA6&96fpzjvYG&$B!R}Pe1(>PMkOaCr_S)&dyFab?OwH
zK7ATK`|LCL{PWM@i!Z)_GiT1gmtTGfXV0F6bLY;%`Sa)D>#x6t3l}cH#ful=(xppq
z`SNA>=9_Qe+i$;xD_5?-)vH(GyYIe(@4x>Ze)!=B`0>Xd;rjLKaO1`e`01yg;O5Pn
j@bk|<!>wDl;P&m?aOV!`B6secE&t#BpYZ@r1N!?9Aa1MR

diff --git a/gpsbabel/testo b/gpsbabel/testo
index 3bdc50732..be0d6d348 100755
--- a/gpsbabel/testo
+++ b/gpsbabel/testo
@@ -1229,12 +1229,12 @@ ${PNAME} -i tomtom_itn -f ${REFERENCE}/route/tomtom_itn.itn -o tomtom_itn -F ${T
 compare ${REFERENCE}/route/tomtom_itn.itn ${TMPDIR}/tomtom_itn.itn
 
 #
-# Garmin Points of Interest "garmin_poi" (.gpi)
+# Garmin Points of Interest "garmin_gpi" (.gpi)
 #
-${PNAME} -i garmin_poi -f ${REFERENCE}/garmin_poi.gpi -o gpx -F ${TMPDIR}/garmin_poi.gpx
-compare ${REFERENCE}/garmin_poi.gpx ${TMPDIR}/garmin_poi.gpx
-${PNAME} -i gpx -f ${REFERENCE}/garmin_poi.gpx -o garmin_poi -F ${TMPDIR}/garmin_poi.gpi
-${PNAME} -i garmin_poi -f ${TMPDIR}/garmin_poi.gpi -o gpx -F ${TMPDIR}/garmin_poi2.gpx
+${PNAME} -i garmin_gpi -f ${REFERENCE}/garmin_gpi.gpi -o gpx -F ${TMPDIR}/garmin_gpi.gpx
+compare ${REFERENCE}/garmin_gpi.gpx ${TMPDIR}/garmin_gpi.gpx
+${PNAME} -i gpx -f ${REFERENCE}/garmin_gpi.gpx -o garmin_gpi -F ${TMPDIR}/garmin_gpi.gpi
+${PNAME} -i garmin_gpi -f ${TMPDIR}/garmin_gpi.gpi -o gpx -F ${TMPDIR}/garmin_poi2.gpx
 compare ${REFERENCE}/garmin_poi2.gpx ${TMPDIR}/garmin_poi2.gpx
 
 
diff --git a/gpsbabel/vecs.c b/gpsbabel/vecs.c
index bf3f5fdb9..7819af044 100644
--- a/gpsbabel/vecs.c
+++ b/gpsbabel/vecs.c
@@ -117,7 +117,7 @@ extern ff_vecs_t alantrl_vecs;
 extern ff_vecs_t vitovtt_vecs;
 extern ff_vecs_t ggv_log_vecs;
 extern ff_vecs_t g7towin_vecs;
-extern ff_vecs_t garmin_poi_vecs;
+extern ff_vecs_t garmin_gpi_vecs;
 
 static
 vecs_t vec_list[] = {
@@ -655,8 +655,8 @@ vecs_t vec_list[] = {
 	},
 #endif
         {
-                &garmin_poi_vecs,
-                "garmin_poi",
+                &garmin_gpi_vecs,
+                "garmin_gpi",
                 "Garmin Points of Interest (.gpi)",
                 "gpi"
         },
-- 
2.30.2